Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert changes from #3046 #3083

Merged
merged 1 commit into from
Nov 11, 2022
Merged

Revert changes from #3046 #3083

merged 1 commit into from
Nov 11, 2022

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Nov 10, 2022 •
edited by juanlofer-eprosima
Loading

Description

This reverts commit 3e0d1d6 because it has introduced the possibility of a deadlock.

We should reintroduce the changes in the near future with an additional test that reliably reproduces the original issue.

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added.
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Fast DDS test suite has been run locally.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A Documentation builds and tests pass locally.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

Reviewer Checklist

  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@MiguelCompany
Revert "Fix datarace on WriterProxy stop while perform_initial_ack_na…
f22b8f6 
…ck (#3046)"

This reverts commit 3e0d1d6.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany added no-test Skip CI tests if PR marked with this label no-aarch Skip build & test for aarch64 labels Nov 10, 2022
@MiguelCompany MiguelCompany marked this pull request as ready for review November 10, 2022 15:46
@JLBuenoLopez JLBuenoLopez added this to the v2.8.1 milestone Nov 11, 2022
juanlofer-eprosima
juanlofer-eprosima approved these changes Nov 11, 2022
View reviewed changes
Copy link
Contributor

@juanlofer-eprosima juanlofer-eprosima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM...

@MiguelCompany MiguelCompany merged commit a374872 into master Nov 11, 2022
@MiguelCompany MiguelCompany deleted the hotfix/revert-3046 branch November 11, 2022 07:47
jparisu pushed a commit that referenced this pull request Dec 7, 2022
@juanlofer-eprosima
Revert "Revert #3046 (#3083)"
25dfec5 
This reverts commit a374872.
EduPonz pushed a commit that referenced this pull request Dec 12, 2022
@juanlofer-eprosima @EduPonz
Revert "Revert #3046 (#3083)"
660776d 
This reverts commit a374872.
MiguelCompany added a commit that referenced this pull request Dec 13, 2022
@juanlofer-eprosima @MiguelCompany
Fix datarace on WriterProxy stop while TimedEvent being triggered (#3097
edf8ef7 
)

* Revert "Revert #3046 (#3083)"

This reverts commit a374872.

* Add regression test

Signed-off-by: Juan López Fernández <juanlopez@eprosima.com>

* New writer proxies manipulation mutex

Signed-off-by: Juan López Fernández <juanlopez@eprosima.com>

* Revert "New writer proxies manipulation mutex"

This reverts commit b18a5272dd8f7d2bc1f01eda0134b8d572ea86a1.

* Unlock reader's mutex before stopping WriterProxy

Signed-off-by: Juan López Fernández <juanlopez@eprosima.com>

* Refs #16341. Fix link error on unit test

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Juan López Fernández <juanlopez@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juanlofer-eprosima juanlofer-eprosima juanlofer-eprosima approved these changes

Assignees
No one assigned
Labels
no-aarch Skip build & test for aarch64 no-test Skip CI tests if PR marked with this label
Projects
None yet
Milestone
v2.8.1
Development

Successfully merging this pull request may close these issues.
3 participants
@MiguelCompany @juanlofer-eprosima @JLBuenoLopez